Handle display_name being NULL. (#354004, Chris Wilson)

2006-09-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c (post_parse_hook):
	* gdk/gdk.c (gdk_init): Handle display_name being NULL.
	(#354004, Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index 96a43d5f32a0de1f0fb35cf58800927dfc9f828a..a22dedc0f5f6a5d1a4da4e11791699aaa459aa43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c (post_parse_hook): 
+       * gdk/gdk.c (gdk_init): Handle display_name being NULL.
+       (#354004, Chris Wilson)
+
 2006-09-03  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_beep): No

diff --git a/gdk/gdk.c b/gdk/gdk.c
index a6aec950ae6955cbc5d205310ce039134d60c6b9..64be2ff90398e62f42c09f384378890f034a6466 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -328,7 +328,8 @@ gdk_init (int *argc, char ***argv)
 {
   if (!gdk_init_check (argc, argv))
     {
-      g_warning ("cannot open display: %s", gdk_get_display_arg_name ());
+      const char *display_name = gdk_get_display_arg_name ();
+      g_warning ("cannot open display: %s", display_name ? display_name : "");
       exit(1);
     }
 }

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 770cbd1700984da24229156bd23daf7aa2db1b89..92af98a25f14570f41ca6d06fc79a38beaea9a6b 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -551,11 +551,12 @@ post_parse_hook (GOptionContext *context,
     {
       if (gdk_display_open_default_libgtk_only () == NULL)
        {
+         const char *display_name = gdk_get_display_arg_name ();
          g_set_error (error, 
                       G_OPTION_ERROR, 
                       G_OPTION_ERROR_FAILED,
                       "cannot open display: %s",
-                      gdk_get_display_arg_name ());
+                      display_name ? display_name : "" );
          
          return FALSE;
        }